Merge "Make safe label more safe" into pi-dev