Merge "SO catalogDB updates"