fabian/prod: links for storagehandler