Merge branch 'JAL-1400_sandboxapp' into JAL-957_jbake