fixes for latest trunk sdk
Merge remote-tracking branch 'origin/polish_trunk_sdk' into polish