Merge remote-tracking branch 'origin/bug/JAL-3082selectRegex' into merge/JAL-3082