Further alignment with upstream