Merge "Update config defaults" into main