Merge pull request #109 from it-workshop/wp/CAROLINE-21/1

CAROLINE-21: teeny tiny small undefined behavior destruction
(cherry picked from commit b941fb4938e2627716b3d3d9931cfff58e8398dd)
Merge pull request #115 from it-workshop/wp-1.0.0/CAROLINE-21/1

Merge pull request #109 from it-workshop/wp/CAROLINE-21/1