commit wb 20140828 @ 1815