Merge branch 'JAL-1486_hiddenStartEnd' into develop