Merge branch 'patch/JAL-4024_jumpScrollHang' into develop