Merge branch 'release/v0.22'
Merge branch 'release/v0.23'
Merge branch 'release/v0.24'
Merge branch 'release/v0.25'
Delay tableView beginUpdates call so we can handle error conditions without crashing.