Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev