Fixes #10016 and updates that rather badly formatted callout