Merge branch 'new-priorities' into next