I see that this issue is fixed. I was struglling with same configuration for a network device.
https://checkmk.com/check_mk-werks.php?werk_id=5054
Only problem, it will not do discovery for this OIDs .1.3.6.1.2.1.1.1.0 and .1.3.6.1.2.1.1.2.0 with context.
I added rule for “Hosts without system description OID”
and its started working.