Merge "Apex using a different network settings file for master"