Merge "Merge hasFunctors & pushStaging into prepareTree"