Beta compatch

This will help us compatch the next patch faster
Merge remote-tracking branch 'origin/Beta-compatch'