Cherry-picked commits after 1.11.7:
