Tracking issue for #1677.
Tracking issue for #1677.