Merge 'dev' into 'livrable_1'