Sub-issue of #468
Sub-issue of #468