Merge commit 'refs/top-bases/t/diffall/fnprefix' into t/diffall/fnprefix