Merge "Change the default return value of Certificate Error handling function." into...