merging develop into crichton-demo

merging `develop` branch into `crichton-demo` branch...
for SQA testing...

(_hopefully I did this correctly, and it works..._)

@brutski ...Please review and merge whenever ready...
Thanks very much!