Commit all for merge with master