Update wips.
WIP 4149 and 4552.