Merge "Avoid running functors after detach"