MPS-20314 - fixed the regexp, the type rule and added a handful of tests
MPS-20314 - updated tests
Merge remote-tracking branch 'origin/master' into 3.2/vaclavFixes
MPS-20314 - fixed the test