Merge "[automerger skipped] Merge "Truncate user data to a limit of 500...

Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into rvc-dev am: a4ddc2b3 am: 09f8c234 -s ours am: 9565105b -s ours am: 230e00c8 -s ours am: 42ccd640 -s ours am: d2b61088 -s ours am: f8ad006d -s ours am: 04dff0e0 -s ours am: 6df1a824 -s ours am: 6c2e7350 -s ours am: 1e4e5461 -s ours am: e455f834 -s ours" into main