Prepare 3.3-dev
Fixed forwarding compact code for 3.x
This is 3.3
Merge branch '3.x-maintenance'