further along with the HTML documentation
(cherry picked from commit 25d3177bd733d26f307cbb80cbb80971a8c4bd93)