Merge "Introduce Message.USER_LOCAL and added logic to map person to user id"