Merge branch 'tor-gitlab/mr/303' into maint-0.4.5