Merge "Tag toString fields for easier bugreport parsing" into sc-dev