Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev