am 90a92053: Various tweaks to wfd

* commit '90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
  Various tweaks to wfd