Merge "Fix direct mode conversion error."