[sr-dev] git:master: Rewritten this small helper function