Merge 92e80e5 into tmp

Approved-by: barosl