i26
Merge #285 into tmp

Approved-by: barosl