Merge "Fix ss-netbox-assign flow"