R1:b5da7b372338

Missing change from D5120 which I incorrectly discarded in a merge.

Auditors: vrana