[FIX] report: correct page numbering
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. b6a7402fdbddfe817fa36292e6f89e8659f9bdea