modify rebuild
Merge branch 'master' into Delta