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