Rebase branch 100 onto Main

After branch 103 is merged with 100, rebase 100 onto main and fix merge conflicts.