Drop clients code
Automatic merge from content server