commit from wb 20131121 17:23