Merge branch 'regionalisation' into test