Merge "Follow the new PTI for document build"