Merge "Get FoldingFeatures only when needed" into udc-qpr-dev