[MERGE] merged with trunk development branch