#1943: Issue1941
opened by gschare
Fixes #1941. Note: branch is built on top of #1940.