Merge from vendor branch NETGRAPH: