Merge "Move shared logic to new package." into main