Merge "Null check AvalancheController.delete" into main