Handle numbers in the same way if they do not have a unit (#12732)

Change-Id: Ic9dba337ffb209bf73ab427fa3a39e542e645c08