Imported v1.3.3 code

Fixes for v1.3 release