CXX-26 .. CXX-35

Ports for additional mainline tests