issue #913 (wip)