Merge commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd' * commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd': Return an empty PluginList instead of null for the
Merge commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd' * commit 'df296b72fc215c2beb5eca92a4c66f71a1b8e7bd': Return an empty PluginList instead of null for the