For https://webarchive.jira.com/browse/HER-2064

For https://webarchive.jira.com/browse/HER-2064.