Changes required for upgrade to 2.3.15, which addresses major vulnerability