Fixes: #1729 Migrated share service