Merge branch 'bug/JAL-2592userDefinedScheme' into develop