Merge "API for safe label to present in the UI" into nyc-dev