Update base and firewall depends
Merge branch 'master' into nginx-refactor