[MERGE] Sync with trunk, to have last fixes