Merge branch 'master' into sapphire_14_24_ss_1013_deep_freeze_and_deep_merge