This is a team work by:
Jonathan Courtois <jonathan.courtois@gmail.com>
Thibaut Cuvelier <tcuvelier@redaction-developpez.com>
Verdvaine Yan <yan.verdavaine@redaction-developpez.com>
Pierre Rossi <pierre.rossi@nokia.com>

Merge-request: 2194
Merge-request: 2196
Merge-request: 321
Reviewed-by: ossi