US594 - Rework wording after initial testing
Merge branch 'development' into development-textupdates