Merge pull request #19290 from ahed-compucorp/dev/core#2269