Merged gcell-wip -r8159:8202 into trunk. This includes the following