Merge tag 'refs/tags/r4275.1_FP2_gms65_1.7.1' into fp2-sibon-staging-16.09.0rc1