Merge branch '3.3-dev' into 3.4-dev