Commented out (temporarily) call to ed.setPortSelected
Merge branch 'tmp' into merge-8.0