Merge "ONOS with new patches"