Commit feature.xml from master