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