693 rebase

Fixes #693