JR1024 reverted breaking changes related to VM