API-1467 NOT connector support