Detect duplicate itemId's (which cause failure), log an error and do a reload.
Merge branch 'release/v0.25'