Merge branch 'update-regions-correctly' into stage