Merge from LA.BF.1.1.2