several changes were needed related to the change of the unique id generation and use
View differences
several changes were needed related to the change of the unique id generation and use