Merge branch 'f.jobq' into rc
Merge branch 'f.doc' into rc