O'Neil: Added feature dependency - Fix to bug issue #22423