Merge "Fix a resource clean-up routine" into rvc-dev