Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken * commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa': Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken * commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa': Maybe fix issue #2568615: System server crashed in SyncStorageEngine