Merge branch 'release/0.12.7' into develop
fix include order to prevent from failing compile
Merge remote-tracking branch 'origin/hotfix/fix-include-order' into develop
roll version 0.12.8
Merge branch 'release/0.12.8'