Bug 5129 : Added more locks to avoid concurrent DS modification conflicts