Merge "Prevent a deadlock in #abandon" into rvc-dev