commit wb 20140826 @ 1815