Update wips.
WIP 4149 and 4552.
Merge pull request #32 from rseanhall/master

WIP 4149 and 4552