Merge "Fix error when backing up channels" into main