Fixes 10016 and updates that rather badly formatted callout

BS3 commit 2970653bdc745d2caab512bf32e51d6a29e51cc2