Merge "Adding advanced pattern support to PatternMatcher" into nyc-mr1-dev