Resync with camptocamp modifications