Merge from Hypatia

Main