Merge r11462:11485 from jcorgan/omni into trunk.