Merge "2/3 Move some Shell utils to the Shared package." into main