Merge "Faster and simpler replace in SSB"