Merge branch 'bug/JAL-2510amendFeatures' into develop