update from base-jvm