Merge branch 't/patch422' into brian