i27
Merge #288 into tmp

Approved-by: barosl