Fix lint errors
Merge branch 'dev'