(cherry picked from commit bf7585530b)
bf7585530b
(cherry picked from commit 23cf9f3b6f)
23cf9f3b6f
Also sync translation template.