[18.0][UPD] Forward port changes from 14.0#776

OCA-git-bot merged 2 commits intoOCA:18.0OCA/queue:18.0from

florentx:18.0_portflorentx/queue:18.0_portCopy head branch name to clipboard