Merge branch 'f.conf' into f.pum
Merge branch 'f.doc' into f.pum
add xptemplate_pum_quick_back support
fix