Merge "Change field type for reverse" into rvc-dev