Merge branch 'bug/JAL-2667mouseWheelWrapped' into develop