release prep
Merge branch 'release/1.7.12'
Merge tag '1.7.12' into develop

Upgrade bug fix.