Merge "Refine fold setting" into main