Latest upstream WHDD improvements