Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev