Merge "Workaround to dump error log instead of exception" into sc-v2-dev