Merge "[Spa] Fix build warnings" into main