#836 + #835 - Fix

Fabrice Ganglerrequested to merge
836_835_fix into develop
  • Fixed #836
  • Fixed #835

Merge request reports