Merge "Add support for new taskstats v9 functionality"