Merge branch 'MasterBugFixing' into 'master'
log only when relevant for enableWordBasedSearch vs wordSearchExclusionMappings
Merge branch 'master' into 'MasterBugFixing'