[cmd:info] fix judgment `null` at @a80db7f0
Merge branch '2.x' into 2.1_n