`thaw` API should throw on first non-legacy error
Merge branch 'dev'