Revert "Revert "The master commit""

This reverts commit 448063e327411e6dbe05a65321d60f827fcb57e7.