Keywords: added support for case insensitivity
Synced from master
Synced from master