Release/1.7 updates

Fixes for #1181, #1321 and #1048