Backport 4.2.0 ha fixes