Merge "style: remove useless trailing semicolon and line continuations" into integration