stick to single resource deletion also on RemoteStoreService side
Merge remote-tracking branch 'origin/master'