We'll probably want to backport it to the LTS branches but waiting first for Simon Urli's validation in the PR.