remerge branche tg052_1
following merging files