Fix add_itv edit (issue #4464)
Fix add_itv edit (issue #4464)
Merge branch 'massiw-feature' into develop