Merge master to dev

Tests merge is still missing