Merge mad-dev into master

NOTE: This merge also includes the previous changes that were in a jpe-dev branch. This was all merged into mad-dev and that's why all these changes will also get merged into master.