Picks !29411 into current auto deploy branch
What does this MR do?
Picks !29411 (merged) into current auto-deploy branch (12-10-auto-deploy-20200412
)
It couldn't be picked automatically due to conflicts !29411 (comment 322771448)
Related to #214212 (closed)
Edited by Mayra Cabrera