Re #1274 - Fixed and extended UIM Dereferencing functionality