Merge 'OCA/contract/6.1' into 'OCA/project-service/6.1'

As discussed at https://github.com/OCA/contract/issues/1.