Merge branch '2980_doc_hints'