Merge f1e7186 into tmp

Approved-by: barosl
h14
h15
Merge 1ac6651 into tmp

Approved-by: barosl
Merge 7b257ef into tmp

Approved-by: barosl