Merge "fix: Somewhat sensibly split the wishlist document"