Release 3.3.0
with backwards compatibility fixes
#1284
Merged
3.3.0
with backwards compatibility fixes
#1284