Merge pull request #5912 from kumpera/bunch-of-changes-for-sdks