Merge "Fix logic in Schema Generator to properly"