Fire4light

Hello @mbenalaya I created this MR to keep track of your changes. I noted that the unittests and integration tests broke on your branch, but your branch is more that 200 commits behind, would you mind bringing all last changes from develop into your branch ? That may fix the tests.

EDIT: Also, there seems to be some merge conflicts, probably due to the very "base" version used, can you look into this please?

Regards. FS