WIP: #880 #881 #882 #883 - Add/Edit software form is followed by mapping form

Merge request reports

Loading