Merge commit 'f256f02c2b88235d1a970d5055b253fd4a302ffe' into fp2-sibon-staging-16.11.0rc1