Merge "Support refactored Region class"