Update with the last modifications in master