Merge remote-tracking branch 'mhujer/error-page-impromevent'