Merged r9680 changes of OSP module into trunk.