Merging correctly the changes with the previous code clean-up

No match.