Merge branch 'master' into mariux/add-apps-to-branch-protection-restrictions