Fixed makefile dependency circle
Merge branch 'mirror_branch'