Merge pull request #90 from it-workshop/wp/CAROLINE-5/1

Wp/caroline 5/1
(cherry picked from commit 092d3ac88ae0846f72a83f6805f274f1c4cdeec8)