Merge "Correct another RegStorage::Solo32"