i25
Merge #287 into tmp

Approved-by: barosl