[21.5 R build] Refactor build-report, add batch capability