Merge branch 'merge/JAL-4054+JAL-4064' into ben-big-merge