Merge global storage options on create Upstream-commit: cd902848e913aead3e8242eca8a6ed6c67e589e1 Component: engine