6.x-1.3-rc1
047480df · Clean-up, cherry-picked from #688566 description. ·