doc: sync with mainline

Updated to cdb110539ff7cee971d29ff74560ca0686058891