Merge remote-tracking branch 'caf/LA.BF.1.1_rb1.16' into lp