Merge #277 into tmp

Approved-by: barosl