MR with updates

Merged Nigel Kukard requested to merge nkukard/cputool:nkupdates into master

Merge request reports