Merge branch 'development/saurom01' into 'master'

Bugfix in function list matching

See merge request tooling/qa-tools!4