feature/BETA-2960
Task: https://schluss.atlassian.net/browse/BETA-2960
Please, follow steps as following comments, before merging:
Edited by Pasindu Jayanath
Task: https://schluss.atlassian.net/browse/BETA-2960
Please, follow steps as following comments, before merging: