Is it possible/feasible to backport this change to LTS branches Thank you, Pedro Ferreira