3.3/master

Add 3.3 support and fixes