2 Commits (feature/global_error_display)