Merge branch '4117-confidential-issue' into 'main' Closes #4117 See merge request !4178
mentioned in commit 340b5a99