Atmire 1761 release 3

Includes atmire-1689 and other corrections, including a merge conflict resolution