Merge "Remove unnecessary semicolon" into main