I'm not completely sure. The narrow space should certainly be used between a number and its unit symbol (kg, cm, Mb, etc.). So your proposal is at least valid for a part of the patch. However, for "5 hours, 4 minutes", I'm not sure it's the same rule. I'd suggest you add references on the ticket and then fix the parts that need to be fixed.