merging develop into crichton-demo

@fosdev @sheavalentine-mdsol @jlo188 please review and merge. Crichton-demo is stale and needs to be updated. Thanks!