Updates for SDK 4.1.6