Merge 727cbba into tmp

Approved-by: barosl