2.0 RC3 config into 1.2.3


Locked