Fix JVPP stable branch builds