Updates for SDK 2.8.