Ported back support for collection projections (NH-2986, NH-3052, NH-3333)
Merge branch '3.3.x'