Merge branch 'tor-gitlab/mr/761' into maint-0.4.8