PLFENG-1886: fix gadget bugs
Merge remote-tracking branch 'origin/stable/4.0.x'