Matches #773 in v3 land.
Matches #774 in v3 land.
Matches #777 in v3 land.