Lazy file fix rebased

Rebased lazy file fix changes to incoming branch.