UC-1596:  Improvements to OsPlugin.