This MR fixes formatting issues that came in through !1286 (merged)
@msaur, thanks for reporting this!
@lpica, could this be merged quickly please?
