corrected compabilability of those patches merged
Merge remote-tracking branch 'arribasim-dev/master' into develop

* arribasim-dev/master:
  corrected compabilability of those patches merged