Merge pull request #312662 from fabaff/reportengine-fix