TESB-10959 keep LocatorFeature as a class