Jira : MICA-1209, MICA-1210, MICA-1211
code optimisation
Merge pull request #179 from smirfolio/master

Jira : MICA-1209, MICA-1210, MICA-1211