Use MatchArgumentQualifier
moved to Core
#931
Merged
MatchArgumentQualifier
moved to Core
#931