Merge branch 'js/grep-patterntype-config'