Copy new manager and storage to pc
Merge commit 'cf54a8b804370ee5ea7f24c77c66399891284529' into development/architecture