Fix for https://webarchive.jira.com/browse/ARI-3985
Revise regex to take into account case-insensitivity.
Resolve conflicts.