Merge branch 'JAL-1023_viewall2structsw7' into Release_2_7_Branch