Another try to merge the tdoc fixes.