Add global gadget info
Merge branch 'release-4.1.19' into develop