US637 - Move labels outside other tags
Merge branch 'release' into development