Merge "Fix VDM IME handling:" into main