Merge d4a97ea into tmp

Approved-by: barosl