Merge #272 into tmp

Approved-by: barosl