commit wb 20140525 @ 1734