Merge branch 'cherrypick/JAL-2808_notabs' into develop