Merge branch 'v1' into 2-1-stable