Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next