Merge d4a97ea into rollup

Approved-by:
Merge 9987cc5 into rollup

Approved-by:
Merge acf7c8c into rollup

Approved-by:
yay
Merge cf64437 into tmp

Approved-by: