[sr-dev] git:4.2:d5fbdd45: registrar: fix backport 5b62b14c065