Merge "Setup backup calling for new UI" into main