merging develop into crichton demo

Ready to merge the latest changes of `develop` branch into the `crichton-demo` branch.

@fosdev ... Please review and merge whenever ready.
Thanks very much!