Merge master fixes into netifd-backport-v3