2.066

Cherry picked from current master.