Improve funct test to resolve 7 timeseries error
Merge branch 'release/v2.1.21'