Merge "Add ConditionTimer to CurrentValueBucket struct"