Merge "MASTER_CLEAR action should not be public" into oc-dev