fix project merge
fix project commit
fix bug commit
Merge remote-tracking branch 'origin/master' into frosa