* cherry pick for 131b1dc3, test=develop, test=document_fix

* cherry pick for fb21a743, test=develop, test=document_fix