merging develop into crichton-demo

@fosdev @sheavalentine-mdsol @jlo188 please merge.