Merge "highlight the error condition when reporting a config issue"