Fix for https://webarchive.jira.com/browse/ARI-3917
Merge remote-tracking branch 'origin/ari-3917' into ait-qa