Ok, I will do the same changes for 2.4 (master). But what about this PR (current branch) ?