BUG-2976: Resolve clash between current and feature cfg pusher