Merge branch 'lg/merge-signoff' into next