Merge "strengthen region validation" into jb-mr1-dev