Merge changes from xCP23x/backup