Ref #3002 : Improve feature code