Merge pull request #784 from laukik-target/local-setup-fix

Merge pull request #784 from laukik-target/local-setup-fix #88