Merge "Add feature flag for supporting minor version in Resources" into main