Merge branch 'pu' into refs/top-bases/girocco