Merge branch 'bugfix/JAL-1239' into Release_2_8_1_Branch