rev to 0.6.0 with new vApp features