Merge master to madhusudancs/error-reporting.

One change missing, we need to include extractErrorMessage from Yingyi which is disabled
during the merge.