May/24th merge