Merge "Fix assert when disabling VVM"