TYR-449
Merge branch 'hotfix-TYR-449' into develop