section given the large number of backports to 2.6.1. (cherry picked from commit fbbb7ff1ed111884d0375c177239073153139848)