Partially merged with master branch. Several plugins upgraded to new
capturing interface