Commit from LIS 3.5