Merge develop into master before creating stable branch

Merge develop into master before creating stable branch
@sheavalentine-mdsol @fosdev