fix tint support
Merge branch 'newcode' into v3.3