1e2ae137bf
This change is caused by previous commit and was extracted as a separate change not to mix JVM and JS changes