Merge branch 'generic-functions' into 'master'

Use generic functions

See merge request !3
2 jobs for master in 2 minutes and 16 seconds
Status Job ID Name Coverage
  Analyze
passed #93867982
analyze

00:01:08

 
  Test
passed #93867983
test

00:01:08