Merge branch 'mcsdk-206-update'