Merged the LFU branch modifications into master