640 - Reporting should support the latest changes in 1.10