Afarahhass main patch 32769

Merge request reports