Merge "[Spa] Upgrade dependencies" into main