Sub-issue of #1587 to keep track of PR #1624.
Sub-issue of #1587 to keep track of PR #1624.