Adding sniff to validate proper variable naming
Merge branch 'master' into in-portal