Merge "Compilation issue fix" into LA.AF.1.1