merge-update from trunk\nadded throws to delete methods of transient services