Merge branch 'master' into feature/hover-direction-aware