Pulling in some upstream changes and adding more plugins