Merged in 2