FIX GG_MERGE

Hello,
Find PR to restore what last commit broke due to conflicts in 2 last PRs.

Regards
Philippe