Merging two Nextgenio branches

Merged Ramon Nou requested to merge nextgenio_bugs into nextgenio_multi

Just merging the two actual nextgenio branches to simplify my life.

Edited by Ramon Nou

Merge request reports