[#49489333] when a fatal error occurs debug toolbar is displayed wrong
Merge remote-tracking branch 'origin/master'