Fig config memory limit floc 962

Fixes FLOC-962

(merge #963 before reviewing this, as those changes are currently merged in to this branch for testing)