Downstream new changes from the main repo

MERGE NOW!