Merge branch 'en/double-semicolon-fix'