Issue #3065586 by Charlie ChX Negyesi, alexpott: ConditionManager::execute() implementation doesn't conform to the interface (cherry picked from commit 91bbb61c)