Add more files for fix to https://webarchive.jira.com/browse/ARI-3858