Improve documentation (Related to #8447)