pull necessary changes from toroidal branch