Update of patch from svn branch persistent-client-service-4735-3.