commit from LEIF before Philly
merge from LEIF