Fle utils merge

Based on #1787.

Pulled in latest `fle-utils`.