Merge "Clear fields that do not have metadata" into rvc-dev