Merged as part of the v3.8.53 fix sweep (author @alirezariahi). Co-authored-by: Alireza <ali.r.riahi@gmail.com> Co-authored-by: Diego Rodrigues de Sa e Souza <diegosouza.pw@gmail.com>