Merge pull request #9079 from s0undt3ch/develop

Fix lint issues.
Remove empty lines from the end of the file.