Merge "Fix externalapi/nbi CSIT"