Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken * commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7': Fix 'bmgr restore'
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken * commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7': Fix 'bmgr restore'