Merge "Apply changes to migrate to upstream"