Server: error for empty restrictions
Merge branch 'master' into share_ui
Implement aborting except for new style imports