Add basic support for .wh..wh..opq Upstream-commit: aa2e3247cb87a7a55fa0258b4ae92c026512ed2a Component: engine