Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket...