[sr-dev] git:4.1:29c81c48: registrar: fix backport f2d23c1a038703