Related to T2482
Depends on D3431 D3432 D3433
Note: that the current master build is red [1] probably due to the latest model
v0.4.0 change. So this diff won't fix it. It will probably need to be rebased D3442
on that future build fix.
[1] https://jenkins.softwareheritage.org/job/DLDSVN/job/tests/718