fix: Merging dev changes and packages upgrade into main branch

fix: Merging dev changes and packages upgrade into main branch #20