State ID patch to ensure being unique when more than one SM
Creating a new branch to develop uCANca integra...