close 45193

close 42547

merge 45193 45785 45784 45786 45787

quit

Pushed to staging as 104151f4f45f4bc3a816e3ad42256452932e0d8d