Including config changes before bootstrap 3 conversion