The service needed lots of changes. A few smaller changes are added into the PR, e.g. replacement for PR #72014. See the commit messages for details.