[sr-dev] git:sr_3.0: Rewritten this small helper function