Two commits,
- First one fix #1195 (closed)
- Second one fix #1194 (closed)
About the unit tests, I would skip them right now because:
- Right now, the tests related to statistics has an skip because they were using an user experiment ( according to the comment )
- There is a high chance that some part of them will change soon for 4.1 ( commented in the code the part that is likely to change )
It is ready to review