merge branch tg052_2 into master