Merge branch feature/jim.king/rebased_plugin_port_from_jim3 with...

Merge branch feature/jim.king/rebased_plugin_port_from_jim3 with refs/heads/master into refs/merge-requests/532/train