This is tracking the spec work for #1082.
This is tracking the spec work for #1082.