#1646 | Config changes for release 3