[SW] Merge nsm's latest fetch patches.