Merge branch 'Upstream/master' (reverted from commit 97f4fa1d53c495749bf3acef5e51f948f1f76580)