Merge "Do not use message=msg in InvalidConfiguration"