Merge "Top up of certServiceClient version"