attempt to trace down last failing test on Jenkins
Merge branch 'devel' into feature/credentials
small fix