Merge branch 'develop' into refactor/JAL-2106_sourceDbRef_revision