Resync with camptocamp