Merge branch 'JAL-1353-bugdemo' into Release_2_8_1_Branch