Merge branch 'bug/JAL-2934proportionalScrolling' into develop