nial/fol: Merge branch 'unify' into HEAD