Sub-issue of #294.
Sub-issue of #294.