upgrade to jvm-common v2