Sync
Sync
Settings changes for release
Merge commit '3adea900303844e0214e9b1d9330a012f78f8f4e'
Merge commit '7111c3c385e1da88a15f141381b9e10a2ebd6bb6'