Merge "Upgrade OOF version in Helm charts"