Merge "Remove unnecessary keyword setting" into main