Revert "Merge origin/master"

This reverts commit 9ebab5bbf2d5b956ae795c6c239e7715afa31925.