Merge branch 'v1.12.x' into next
Merge branch 'next' into sam_2130