Merge "fix functor flag parsing, tweak process delay"