Merge dev to master for iOS 1.39 changes