Merge 5ad317f into rollup

Approved-by: barosl
Merge 0b84bff into tmp

Approved-by: