The changes here have also been patched back to 10.18.
Note, the [PRESIDECMS-2827] - JIRA ticket released here was not patched correctly (at all) to prior versions. This has been repatched with new hotfix releases from 10.18-10.25 and the release notes updated.