[MERGE] from trunk-openchatter-chm