Merge "Enhance resource sharing and enable ownership transfer"