Merge branch 'features/JAL-1370_patchshowunconserved' into develop