merge gtk-testing and main branch