HP update from 3c638867 to main (net fixes, UI, a11y)