Merge pull request #23599 from aydun/contriberror