BZ-12803 updated language
Merge branch 'Sprint74-CP' into integration