pulled upstream module updates needed for HA