Add prep for custom analyzers / variable name analyzer
Fix broken mapping
Merge branch 'custom_analyzer' into dev