Merge 2a92fbb into rollup

Approved-by: barosl
Merge d4a97ea into rollup

Approved-by: barosl
Merge acf7c8c into rollup

Approved-by: barosl
Merge c8a5264 into tmp

Approved-by: barosl