First part of changes merge