Update WIP4299 to be in sync with its feature request