g10
Merge 502e948 into tmp

Approved-by: barosl