Merge "Fix dynamic_ownership"