[TASK] Backport changes to Extbase_Error_Message