Merge branch 'inv_vendor' into 'master'

Fix export inv.objectmodel to JSON

See merge request !2140

(cherry picked from commit bbfcda91)

93b69e11 Fix export inv.objectmodel to JSON
9 jobs for cherry-pick-bbfcda91 in 15 minutes and 40 seconds (queued for 8 seconds)