Merge branch 't/girocco/version' into refs/top-bases/girocco