Merge branch LA.AF.1.1_rb1.5