TYNSTEP-594
TYNSTEP-703 TYNSTEP-767
Fixes for catch phrase