Implement PR3266 & PR5276, folding: