Issue #2389627 by thehong: Port Cloze question handler