Sync R1.06

This pull request include all commits in master, except ifmap change (ifmap-view doesn't exist and the build process is broken…)