Revert "Revert "Build-config""

This reverts commit f9c2de3b57cf02c18821b68b54b2249d9bf07fd7.