[IM] Fixes and improvements from live
Merge branch 'nf-switchports-recovered'