Merge branch 'jc/grep-commandline-vs-configuration'