Key search in rawOptions done case insensitively
Merge branch 'release' into dev