Fix bug RT #74622.

Signed-off-by: Xiong Changnian <xiong-cpan@xuefang.com>
Merge branch 'feature-RT74622' into devel

Signed-off-by: Xiong Changnian <xiong-cpan@xuefang.com>