Yeah, the code in AbstractInvocationContextContainer had some differences (the thread local was only set for FlagAffectedCommands) but I'm not sure it was correct. I removed the if.