Merge branch 'origin/master' (reverted from commit 9ba99e5b284bfc2c074a96918401dfd82f4c9868)