[MERGE]: Merge with latest trunk-server