Preparing to merge FUNCTOR-14