A merge from gitlab.com mirror on behalf of Agniezska.
Please inspect that the config changes are ok.