Feature/beta 2803
This is a combination of following tasks:
https://schluss.atlassian.net/browse/BETA-2787
https://schluss.atlassian.net/browse/BETA-2789
https://schluss.atlassian.net/browse/BETA-2803
This is a combination of following tasks:
https://schluss.atlassian.net/browse/BETA-2787
https://schluss.atlassian.net/browse/BETA-2789
https://schluss.atlassian.net/browse/BETA-2803