Merge "Cleaning up resources on mount destruction." into rvc-dev