Merge "Add more characteristics and fix inconsistencies" into main