US5959: Added catnip
Merge branch 'Step4'