Ert 815

[ This is not ready for merge ]

The PR contains infrastructure changes required for the coming region update PR.