Follows #4505.
Follows #4505.