Merge branch 'bug/JAL-3072scrollThread' into merge/JAL-3072_3073