Merge "[tools] g_sans - add trajectory avereging"