Merge fix for issue 11778, silence false error messages