Closes #290 and makes #314 obsolete as we store both auto- and cross-correlations (manually cherry picked from commit f995f3da)