Merged eb/gcell-wip2 rev 10130:10152 into trunk.