Integrate SDK 24

Please add TFS item to track this