Merge branch 'fix-avs-combo-ports' into 'master'

Fix ComboPorts on ObjectModels.

See merge request !6914

(cherry picked from commit 6c2b632b)

8963f106 Fix ComboPorts on ObjectModels.
2fce1324 Fix typo.
d5bfaa39 Fix labels.