Methods name changes
Merge origin/master
Monitor corrected to handle Optimiser interruption.
Merge origin/master