WIP: bug/22814 #1

Draft
roberto.cirillo wants to merge 2 commits from bug/22814 into master

2 Commits