Revert "Master setup"

This reverts commit 3057911a8c3f420db7fc552fcb6ca08d917c96df.
Revert "Revert "Master setup""

This reverts commit 1bb85bff065f3d6290b98d90e6f4cbe47f5fe2a5.