Merge #279 into tmp

Approved-by: barosl