Merge "Remove duplicated kernel structures." into main