Merge branch...

Merge branch 'sprint/JollyJellyfish.feat.integrate.entities-service.single.entitystore.update.activity-screen' into 'release/3.8.0'

[Sprint/JollyJellyfish] (feat) use entities service in activity screen

See merge request !273