Adding swivs config settings before my merge