Merge "Allow fine-grained control over functors execution"