Draft: Reroll of 37 patch with some extra findings

Marcin Grabiasrequested to merge
issue/group-3020883:3020883-37-reroll into 3.3.x

Closes #3020883

Merge request reports