Merge "Add support for calculation window size and tids" into main