OCT-10 done. Fixes #916