part of fix for CO-202
part of fix for CO-202

ibrsp/comanage-registry,mlaa/comanage-registry,mlaa/comanage-registry,irtnog/comanage-registry,ibrsp/comanage-registry,mlaa/comanage-registry,irtnog/comanage-registry,irtnog/comanage-registry,mlaa/comanage-registry,irtnog/comanage-registry,ibrsp/comanage-registry,ibrsp/comanage-registry