Merge branch 'tor-gitlab/mr/518'