Merge "Make --jvm work again"