Merge "Additional lock to avoid access to deleted object." into rvc-dev