Feature/lintbuild

See commit messages