Merge "Do not create empty config file"