v2.0.0 synchronization

Synchronized all the configs with the 2.0.0 release