fix: [PR-1911] avoid recursive sf upgrade calls
#246
+92
−74
Merged