More continuous handling of information during multiple matches.
Merge remote-tracking branch 'origin/master'