Merge 92e80e5 into rollup

Approved-by: barosl
Merge 077526f into tmp

Approved-by: