Merge 'patch-tracking/4/proposed/netdef-solaris' into accepted