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