Merge branch 'backport-ghs-crash' into ghs-crash