Merge iOS 1.39 changes