Such refactoring cannot be done in a maitenance branch. It should go into master