Merge "Stop double-printing config"