Merge "Add persistentFeature application attribute." into oc-dev