Merge branch 'personal/floca/matchpoint-integration-2' into T20000-MatchPoint-Integration
Conflicts: Plugins/PluginList.cmake