Colin - I went ahead and cherry-picked 81ad4276b505e987dd8ebbdf63605f92cd172b52 since it is already marked for stable.
Colin - I went ahead and cherry-picked 81ad4276b505e98 7dd8ebbdf63605f 92cd172b52 since it is already marked for stable.