Improve funct test to resolve context.ser error
Merge branch 'release/v2.1.17'