[sr-dev] git:master: registrar(k): port from 1.5 branch, r5873