#1432 Content services refactoring to have common code in base class