Merge branch 'JAL-1400_sandboxapp' into Release_2_8_Branch