Merge branch 'feature/JAL-3982_mouseover_highlighting_viaJAL-3860' into feature/JAL...