ClientAgent: Fixes explosion caused by merging master