Merge "Swap ownership to mingaleev@"