WIP: Devel

I've incorporated your changes and added some bigger chunks myself. @anjana.elapavalore please go through the changes carefully, see if they make sense.

FYI @emma.schymanski