Merge branch 'chore/lint' into 'master'