Add option to prevent report (part2) #2523