[master] MatcherContext: one small modification again