Adding patch by @poker10
Merged results pipeline #467606 skipped
Merged results pipeline skipped for 52f09fb0
merged