[MOD] Required changes
Merge pull request #482 from oihane/8.0-estimated

[MOD] Required changes