794 for master

see #799