Merge remote-tracking branch 'caf/LA.BF.1.1.3_rb1.15' into cm-14.1