Merge commit 'f099076bfbfb485ac3c030b61329d80f7bdf82e4' * commit 'f099076bfbfb485ac3c030b61329d80f7bdf82e4': update for new plugin api
Merge commit 'f099076bfbfb485ac3c030b61329d80f7bdf82e4' * commit 'f099076bfbfb485ac3c030b61329d80f7bdf82e4': update for new plugin api