Merge main + mini-fix