merging develop into crichton-demo

@jlo188 @fosdev @pservedio @sheavalentine-mdsol please merge!