We deprecate cross-store support to remove cross-store with a future release. Original pull request: #471.