Merge remote-tracking branch 'upstream/master'
Fix status problem in projects & fund test