fixed my last version dependency checkin that disabled many features...
Merge remote-tracking branch 'origin/master'