Merge "[sb] fallback from data_spn to spn" into main