i17
Merge #278 into tmp

Approved-by: barosl