Fix for https://webarchive.jira.com/browse/ARI-4061
Merge branch 'ari-4061' into ait-qa