This commit re-applies 49f3c0ce53 which was lost while splitting pages for Antora. Issue gh-13816 Issue gh-10120
49f3c0ce53