Merge "DB Schema Change for SO Catalog"