v2.16.4 protégée
c228017d · Merge branch 'backport-3258' into 'v2.16' ·