merge Lada commit