AA: iwinfo: merge r36471