Fix logging error in tests
Merge branch 'develop' into staging/2.11.4