Merge 9987cc5 into tmp

Approved-by: barosl