Merge "incident report args: add setter stubs & constant aliases"