Merge "SO catalogDB updates"

No match.