Fix code style.
Merge branch 'fix-dependency-resolving'