Hotfix emergency
Merge tag 'JIRA-HOTFIX-1005-SIGNOFF-1' into production

Approved for merge.

MERGE: JIRA-HOTFIX-1005 > production