Cross statistics fixes Closes #302 and #217 See merge request !424
mentioned in commit 63b55c6d
mentioned in commit 684dc8a0
mentioned in commit 8f7a90e4