Merge branch 'JAL-1486_hiddenStartEnd' into Release_2_8_1_Branch