Merge pull request #10833 from gottesmm/enum_valueownershipkind_erased_return_value