fix #3276: NPE because of a null log types
Merge branch 'release' into upstream
refactoring: add more annotations