Resolves ZSTAC-17625, ZSTAC-17616
Resolves ZSTAC-17625, ZSTAC-17616

Signed-off-by: David Lee <15c338f3b79a63a0d5423e9c6562cd312918fe74@gmail.com>

zstackio/zstack,AlanJager/zstack,zstackorg/zstack,MatheMatrix/zstack,MatheMatrix/zstack,zstackio/zstack,AlanJager/zstack,AlanJager/zstack,zstackorg/zstack,zstackio/zstack,MatheMatrix/zstack