Automatic merge of 'next' into merge (2024-06-17 15:38)