CDB-3835 stubbing