Merge "[RESTRICT AUTOMERGE] Workaround to dump error log instead of exception" into sc-dev