3.3-EA2 compatibility update
3.3-RC1-SNAPSHOT