Merge pull reuqest #50 from 'hotfixes-v2.26'

Test configuration files were updated.
Merge branch 'v2.26' into hotfixes-v2.26