Merge "Add an option to zip incident report" into rvc-dev