* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87': Merge hasFunctors & pushStaging into prepareTree