Merged r9595/6 changes of OSP module into trunk.