performance optimization: do not create NPE, return null
Merge remote-tracking branch 'origin/1.3.x' into 1.3.x
status = rc