Sync PEFS with latest from Gleb