Update to match latest dev branch of the compiler