Merge commit '90a5c6257f134d2eb7f7118b261b53880429599c' into fp2-sibon-staging-16.10.0rc1