[TLBB] UMP changes