Revert "Revert "Merge branch 'master' into deploy-to-testflight""

This reverts commit 3e0ea8f0727423f91ec3c0c5043b463105fab6eb.
Revert "Revert "Merge branch 'master' into deploy-to-testflight""

This reverts commit dcbc53bb28ac064ba8ca8b7a1f65daeb8ca11adb.