Revert "Revert "Master Commit""

This reverts commit 760dbb41011495931690d7c100429bde89309018.