Branch 2.2.0 vcc

Pulling in the tags from the apache fork