FOR-872 - RollBack of the patch in order to take into account Thorsten remarks. Waiting for a new patch Clay...
Changed paths: