Merge "Remove MACRO_1 mapping from default reference remote kl file." into main