Sub-issue for #644
Sub-issue for #644