Merge #267 into tmp

Approved-by: barosl