More DM stuff.
Small changes to cloud references
More on the cloud stuff
Merge branch 'master' into conditions_db