2.1 changes, due to branch reorg