Merge Devel into Master

Merge Devel into Master for new release