Automatic merge of 'fixes' into merge (2026-09-14 12:54)