i25
i27
Merge #287 into tmp

Approved-by: barosl
Merge #288 into tmp

Approved-by: barosl