prevent error messages
Merge branch 'release/1.5.26'