Merge branch '3666_iec_si_prefixes_fix'