Massive merge #22 #33 #34 #55 #70