commit from KCM @14.08.13