changes to 2.0 due to branch reorg