Merge branch 'develop' into feature/MRPluginLayerTest
Fixed junit tests to run in proper order
Merge remote-tracking branch 'origin/feature/MRPluginLayerTest' into feature/MRPluginLayerTest