merge latest tested changes