Changes to be reviewed

Please see commit history for detailed information
The develop branch has been tested on a VM cluster deployment