Merge proposals dependent on lp://staging/~camptocamp/ocb-addons/7.0-fix-updated-lp-1204832-RDE

1. 7.0-fix-updated-lp-1204832-RDE
2. Dependent merge proposals