Merged changes from eb/digital-wip into trunk.