Merge pull request #6634 from tobiasd/20190210-crepairwarning