Changed settings and build tools
(cherry picked from commit 0a6e705)