Merge pull request #92 from it-workshop/wp/CAROLINE-20/1

wp/CAROLINE-20/1
(cherry picked from commit 9f11c0382a2ec73284e0ddd9367189cadd1b4208)
Merge pull request #93 from it-workshop/wp-1.0.0/CAROLINE-20/1

Merge pull request #92 from it-workshop/wp/CAROLINE-20/1