update tags
Merge branch 'f.doc' into rc