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