8.x-1.1
3e526c2b · Resolve #3304900 "Backport to 1.x" ·