Merge branch 'hotfix/security-rewrites-2-1-4'
Keys in lookup map must be lowercase
Merge branch 'hotfix/security-rewrites' into develop