Merge "trim and strip html tags for load safe label name" into nyc-dev