Merge "Refresh templates when fp removal fails" into main