[15.0][UPD] Forward port changes from 14.0 - #730

[15.0][UPD] Forward port changes from 14.0#730

florentx wants to merge 14 commits into

OCA:15.0OCA/queue:15.0from

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