Oe3.3.1

Merge 3.3.1 into develop branch.  Post merge step of updating release number will be needed