Auto-Merge pull request #2548 from octo/cid/42796