Merge "Change references to old loadSafeLabel method"