Merge "Backport a bug fix to K and L"