Merge "Add counts to Task headers" into stable-2.16