Merge #267 into rollup

Approved-by: barosl
Merge #271 into tmp

Approved-by: