Updated for v3.4.0 release