Merge pull request #9 from DominikSuess/issue/SLING-8106

Issue/sling 8106