#88707 gn integration widget improvements