Re #1708 UIM related changes