Merge pull request #1305 from NanXiao/format-vfscount