Merge "Upgrade gwtorm to 1.11" into stable-2.9