Merge pull request #17640 from samuelsov/bugreportcivigrant