Minor merge conflicts resolved
Merge branch '3.3-ancr' into 3.4-ancr