Merging pre-release with master - 07-Jul Release #36

Closed gaynell-gonsalves closed 6 years ago