Merge "Fix NPE in MasterClear"