Automatic merge of 'next' into merge (2025-05-12 10:01)