Cherry pick from satellite
A series of commits made on the satellite have been collected in this merge request.
Some of them gave conflicts. In which case the version on the satellite has been retained (after checking that conflicts regarded some missing parts of the files). Those commits are listed as ‘cherry-picked from satellite '