Merge "Fix Unicast Presence Error"