Merged eb/omni -r4315:4327 into trunk.