Ide 2.0 updates for 6.1.x

These updates for the IDE 2.0 release are ready for merging into 6.1.x. Thanks.