Merge remote-tracking branch 'origin/fp/fp2_5.1_int' into fp2-sibon-staging-16.05.00.1