Fixed #20246 -- Added non-breaking spaces between values an units