Merge "Get FoldingFeatures only when needed" into main