Merge changes from topic "prepare-singleton-system-provider" into main

* changes:
  Extract getSystemProviderForUser method
  Extract getSystemProvider method