Merge "Make master mono controlled through settings" into nyc-dev