Merge "Refactoring: shortening of match methods"