faastforward modifications from master