Merge "remove @Feature usages"