Merge "Config to debug overflow"