HiliteHandler only added once
Merge branch 'master' into dimswapBugfixes