Merge "Add a comment mentioning that errors might be unbundled, to improve backwards compatibility story." into sc-dev