Merge "Spatial SVC crash fix"