Merge pull request #4709 from EmmanuelMess/emmanuelmess/fix/hotfix/3.11.3