[MERGE] Merged with mail-state-tde branch, recently udpated with trunk.