Merge tracking into branch used for GUI backend

Merge tracking into branch used for GUI backend