Sub-issue of #19, implemented by PR #22.
Sub-issue of #19, implemented by PR #22.