beta 4 merge