Extend with some more plugins.
Merge from master.